starting to clean it up and standardize