Better comments and organisation