Rework & rename calculate methods.
Improve Column & Prestation attributes.