Introduced helpers
Code cleanup