Minor style updates and cleanup