Style changes

Updates relating to readability and consitency throughout the code.