Moved some stuff around based on pylint