Some clean up and adjustments