Implemented "lazy" forced with optional timeout

Also, indentation fixes