1. More cleanups: changed variables names to camelCase