A lot of various modifications to make it more tidy.