Minor cleanup. Moved definitions to their own file