cleaned up formatting and syntax