Optimization

Reduced memory impact by 24 bytes(32 bytes to 8 bytes)