Fixes to match accepted coding standards for this project