Finished commenting / clean-up