removal of frivolous if-else conds, commented code
subtle tidyup