re-organize code, remove blank line