Slight refactoring/formatting