Code cleanup. Made further use of game constant class