fixes / code cleaning