Change code structure