Cleaned up some more in the src code

I moved around some more codes into methods of the Control class….