cleaning up bucket code complexity