Clean up code so it imports into Eclipse better