Move constants into a constants file
Remove unused variables
Move screen size into constants