Code clean, added helper methods