Removing magic strings and TODO items