code/layout cleanup