Cleaned up the build process immensely.