cleaning up some code
Adding complete option, tests and code
Adding complete option, tests and code
code clean-up