Updates some naming conventions and code formatting