code cleaning: use camelCase for all functions