Refactored extension methods/props a bit.