#5 removing unused var & renaming vars