Remove stupid variable
Remove unneeded private methods
Only one short method for setting time headers