cleaning up code; comments; extracting features