refactor

Small additions.