Moved helper functions to better files.