removed unnecessary else case, added commen