Some cleanup and minor changes

Signed-off-by: Peter Atashian <retep998@gmail.com>