Clean it up!

by renqwerty @renqwerty