Evening commit

Continued cleaning code