Improve make up and code refactoring