Refined helper methods
Form fix to pass tests