Reorganise a few methods