Few Design Changes

These design changes should not affect the functionality.