fix file path and bit more style