Code clean, create util classes