Simplify names
normalize_epoch wants to be a void
Delete unused struct
Monitor code cleanup