code restructurings