Basic < 5 minute restructure of code