LAC-9: Clean code