Revert "Issues 31 and 52 addressed"

This reverts commit ba288927142021e342597ae00afa5af867af3e27.