Minor reformatting to fix code style and a todo