Some tapkee methods improvement for better readability