Fix newline at the end and fix the namespace correctly