Revert "Revert "update & cleanup""

This reverts commit ad05504225782cd2ec8a2df356da20126444aed4.