slight updates to source code, comments, removing waste