Few changes to toString/constructor