Formatting
Reorder intialization
Removed unnecessary filter