Code clean up + fireball