keyboard: code uncleanup