Minor changes. Added todo comment, and removed unnecessary blank lines