syntax correction
code cleanup