Small Restructure for later changes