Cleaned out unnecessary commented sections