7.x code standards

Module was somewhat messy... Now it passes(/will pass) coder!