Code Refactoring. Added Hungarian notation und improved style