Style changes and new TODO