Cleaned up code and added a splash screen