added TODO and got rid of some white space