maintenance

removed unnecessary moves and enforced coding conventions