Added constant and commented functions