- changed file related access to nio
- clean-up