Readers Writers aspect fixed; tests
Refactored code