Enhanced preformance and general OO/c#-ish-ness of the project