Added some minor cleaning