Removed excess code elements + comments