Formatting and cleanup of JGraphXAdapter