Cleaning & Consistency

Can ignore, no functionality here