cleanup a bit
added spacer 40