cleaning up unused variables. adding comments. formatting to cinder guidelines