Light refactoring to make code more presentable.