Removed null value and some stuff
small stuff