move bubbles + clean code