Clean code and fix for ISO layout