Implements some coding recommendations
Implements some coding recommendations