Code clean-up
Add metadata, clean-up code