Cleans up public properties some.