Remove forgotten @todo and convert my own model to spaces for PSR-2