Added proper accessors and switch most of the variable names to snake case