cr fixes, removing print methods, unnecassary comments, changing strings