code rearrangements & added timestamp alias