moving helper functions to core module
Minor code improvements