Delete constructor, minor changes