More refactorizations. Applied naming conventions to events, and refactorized a couple of methods to make them more readable and efficient. Moved some logic from the event handlers to private functions, this will be the starting point to a greater change in the source code.