Last part refactoring