Minor style modifications and cleanup