Code Clenup  + JOSVersion 2.3