Code cleanup and refactoring

Mainly refactoring addteamcsv to camelCase