Performance improvements based on benchmarks (#64)

Performance improvements based on benchmarks (#64) #54