Another small changeset through all the files

Done optimizations to Timer