Master cleaned

cleaning up