Some code refactoring, build cleaning