A bit more refactoring a couple new SWT helper methods