Some cleanup in files to more easy code work in future