ETC: clean up codes, layouts