readability and method order changes