Code cleanup and small changes

Additionally, splash screen may now be closed with escape key