Better comments and organization