Touch of code cleanup
More cleanup