Code clean up and minor restructure/simplification