Code cleanup and Print job completed developement