Bug fix
Fix a bug in previous commit
Code cleanup