Removed prints and smal fixes
Some style changes