Added new definitions to physics, adjusted code style