Cleanup
Added binary string to number conversion