even more code cleaning