Cleans up some comments adds categories