Small cleanup and scripts at the bottom