Clean up and maintainance on commerce branch
Merge pull request #222 from likewhoa/fr-commerce

Clean up and maintainance on commerce branch