Remove dangling declarations
Fix indentation
Remove inappropriate assertion