Cleaned up files
Improved content searching