Code cleanup. Using the const here made the code more... messy