Team-Swamp/conventions

Team-swamp code convention.