Cleanup

This is me being picky on useless stuff that was added and neatness.