Random changes and clean up