Added commented methods and constructor