Small styling change/some refactoring