Code cleaning

Clean up code: fix spacing, update comments, clean up examples, etc.