Refactor Proposal #21

Closed ishan-marikar closed 9 years ago