First refactoring post.