Cleaned up formatting and removed redundant mb_* function check