Code cleanup

Code cleanup for HUD class