Cleanup?

Cleaning some of those dang eclipse warnings