Better comments, remove unused var