naming and classes/modules edits
spaces & indentation fixes