Minor code cleanUp