Case simplification by using andalso and orelse
Use ets:tab() instead of own definition
Code simplification