Cleaned up code using eclipse tools