style cleanup
basic library alignment