Cleaned up bimp-utils and function names