Removed CommandDocument - just using Document now as CommandDocument had no extra functionality
Fixed findbugs errors