Code cleanup
Fixed copy/paste typo
Code cleanup
More code cleanup