Restore formatting and moving timer to pool
Fix formatting