update comments, indent, remove unnecessary params