Cleaned up code using eclipse built in formatter.