cleaned up a bit in character package