Quick code cleaning, issue reported in last commit still exists