Cleanup and simplifications
Cleanup and FindBug fixes