Mensi upravy a refactor