[B] General Code Cleanup