Restructure some code