Removed helpers, its more clear now