reduced comments
tidy more