Do some code and build refactoring