arranged structure
added comment
minor fixes