change function name + fix style