Adjusting type and removing variables
Various layout utilities