Remove whitespace and default constructor