Clean Up Code

Cleaned up the code a bit to make Eclipse happy.