Code Review

make code more readable, remove unhelpful comments, document Debug
comments