Cleaned up some comments etc