Cleaned up formatting, fixed timer code.