Master

Code cleanup