Cleanup and removing duplicate hardcoded ints.