improved code style, fixed ordering issue
lines shorted, ordering bug in builder_app fixed