Re-factor to bring consistency and increase re-use

Added-Comments around new methods