cleaning things up
finally something nice :)