MC-88: Clean code