cleaning up code, commenting code