Clean up to make it easier to understand

Also removed empty spaces