Code clean-up, add symbols to package export list