Code and site clean up