Minor coding standards updates
Updated TODO