Improve functions to reduce Duplicate Code