Refactor, code clean.