Code cleanup
Merge commit 'edfa49b'