Fixed some coding standards, looked at Maz validation