refactor according to the coding-conventions
- package fixed
-line endings fixed