Making code style more consistant