removed repeats and improved naming