Cleaning code
Add nose testing within python file