Removed all uses of 'dynamic'
Formatting clean-up