Small restructure
Small restructure