Clean & tidy. Minor problems