Clean
And Closes #49