Little clean-up efforts
Slight updates