Refactored name, and added comments