Add some comments and clean-up