Slight restructure for better structure