Add comments + fix formatting