Added comments + Cleaning functions