Code cleaning, last commit (i hope)