add exceprt
clean up style