Commented methods, added constructor