fixed minor error
fixed more error
reformatted structure