Cleaned up forcefieldfunctions module