Reorganise some methods and/or tidy-up