Change access modifiers from protected to private
Make code improvments suggested by Eclipse/FindBugs