Added comments and changed variables to properties