Cleaned up code and files for final package.