post build refactor