tried to clean up a bit
include fix