nit: can you remove all the blank lines that you added?