Code Cleanup final classes