Cleaning up things to make rake validate and rake lint throw no more errors.