General Cleanup & Code Optimizations

This makes search more performant, demonstrates aliases, cleans up spacing and code replication especially in version three.