Moving some code around and adding some comments