[sd2_mr0551] Remove hack, style changes, fix small bug (ICC\Lord Marrowgar)