PropCore: Cleaned up a little lazy coding
Fixes #241