Broke up more methods and variables for readability