Refactor small pieces (code layout)