Cleaning out old log statements and adding more useful comments