Refactored Common; added comments