Fixes for formatting, don't use strftime anymore