Updated functions to respect Java's coding conventions