Refactor + some settings