Refining code, more comments