Improved code lisibility & adding some helpers

Adding of