Cleaned up JavaBean plugin