Fixes name of called method

… and does some minor cleanup