Remove "todo" note
Rename protected methods
Implement more formatting methods