More Clean up and Lint