Closes #235. Code review

#182 
No. I will remove it