Reworked comments and adjusted variable names