Refactoring, and nice axes labels