Tidied up some design