attempt to clean up a bit
stup
..