cleaned up code; deleted comments&unnecessary stuff