guidelines updates, move all functions to class

Naming and spacing guidelines updates