if/elif cleaning