Cleanup the code, make it crisper
More cleanups
Fix the comment :)
Implement basic testing infrastrucutre
Simpler set-up