Removed 'Add more comments to the code' from TODO