Cleaning up eclipse warnings across various files