small changes and improved indention structure