Starting code cleanup