Starting to clean up my code so it's more readable