tidy and make portable