unecessary lock
little betterings