tidy and give better name