There was alot of duplication in this file. By reducing it to one-liners its much more readable.