some cleaning, removed not needed stuff, changed values to blank null value when nothing saved yet