Cleanup
Fix for 1-nibble address bug