Major update and cleanup