Optimization

Changed objects to primitives