code cleanup by architekt