FIX: code beautifying