Clean up code

Needs some logical spacing.