Tidy Codes

Shift all object creation to Pool object