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