Correct static calling method
Small style tweaks