Separated the code