Fixing some spacing, comments and naming