Fixed formatting issues.

Moved @todo statements onto one line as shown in the php docs. This will also allow any IDE to pickup and show what the @todo is about.