Basic Cleanup
Mass Refractoring part 1