PEP8
PEP8
PEP8
move display to separate file