sync and update code to standard