[BUG #7141] cleaned up functions
[BUG #7141] minor change