added style test, minor cleanings