Slightly refactoring code layout.