minor stylistic changes, TODO comments added