Making refactor for we can compilie