made it look nicer
found unused code