Fix PHPDoc formatting
Add braces to condition to match WordPress coding style
Add a few more TODO tasks