Cleaned up those dynamic properties