finish clean-code modification