Function call refactor (LESS BITS FTW!)