Made functions consistent