Cleaning up code - Part 2