Fixing some readbility problems