More code cleaning - defs