cleanup reps and code style