Tidy-up one method