Code clean up and adding a code debugger.