Modify code for readable