Helper functions clean-up