Change logs

- Code clean up, minor bug fix