Making some structure adjustments which will help improve performance later on