cleanup
changed code styling