Code clean-up, personal comments erased