Separated the code...

More professional..