Some cleanup plus optimized memory requirement #53

Closed mcremone closed 4 years ago