Stying pass across the codebase. Fixing conventions.