Further cleanup and separation of properties, methods and event handlers

This were a little slow downstairs :smile: