Cleaning up Code + Commenting