Issues #154 #155

* Also some CS fixes
Removed duplicated lines