PSR-2. Fixed typos. Small cleanup.