-comment, cleanup, redundancies removed

-i have retained a backup in case testing this something is weird which
also implies we need to test the correctness of this final version