Simplifying implementation and shortening func names