7.x code standards

Module was somewhat messy... Now it passes coder!