fixed naming
updated header
fixed formatting