Added some tidy parts