by: Felix; Fixed Peephole, cleanup