Reduce non required checks and code loops