Cleanup...
More cleanup, made full screen option