Style updates
More style updates + proper scopes
Kill the cache. Closes #40