Some random changes and cleanup
Some random changes and cleanup