added changes, fixed style (white spaces)