minor code clean up before going full screen