Oops! Now - Optimize and defragment code