cleaned up via resharper
Made hide shadow work better