Made things more tidy.