Cleaning some stuff up, avoiding warnings, namegen is marginally faster