file cleanup and some revision in methods/motivation