Update 11

Cleaned the code abit