Cleaned up. Also updated the readme.