More separation of code