Refactored duplicated code
First attempted fix for client to client GUI bean bounces