Quick code restructure