Addressed TODOs.
close comments
reformat code
merge feature/command-line