code tidy is not always good...