Clean up a method, now code is even more clean and easy to read