Tidy-up + fix mistake