Code cleanup : simplification of code, addition of TODO to investigate item for fix

Post commit code review : Daniel Jao