Updated to follow coding conventions

Edited so changed and fixes now follow coding conventions