Removed explicit return @ from constructor