Small code-style consistancy improvements