Clean up PR #18 and spacebar event