code style cleanup
correctly resolve paths