removes interpolation, optimizes code, name issue fixes