Further changes to conform to project standards