Finished separating code