Fixed formatting and added a better variable for time out

@zmc Please review, merge and delete branch


Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>