Applied some naming conventions and fixed version