Minor style changes and code cleanup