Spring Cleaning

Just made some small clean-ups to the code