Cleanup

The inconsistencies in code style annoyed me...