remove whitespace
added TODO