Sys tick refactor