Cleanup & formatting & update