Got rid of strange helper method