Implemented Uncle Bob's advises