cleaned up src with comments