Code improvements

Some cleaning