Make the code more clean