refactoing going on