added ideas for addSpaces method
added TODO for rewriteSource method