Cleaning as mentioned in #13