Correct indentation and function declaration oversights; change file naming rules