Cleanup and Streamlining

Strapd is starting to get sexy