Removed ActiveModel dependency
Whitespace cleanup