performance and name refactor