commenting+cleaning up code