Cleaned code

Cleaned fragment A