Changes 2/4

Cleaned  some code