Minor style changes and file locations