Cleaning code!
Clean up code.

Fix only returning one favorite bug.