Fix: Changed statement like while to enhanced for loop and if to ternary operator

Fix: Changed statement like while to enhanced for loop and if to ternary operator #36