implemented "Correct" comments, removed unnecessary inits