All around code cleanup

commenting and deletion