More blank lines
Added comments, removed dead code