Minor styling refactoring
Minor corrections