Some cleanup in the code
Some cleanup in the code 2