Minor refactoring: remove init() in some objects