Clean up specs and fix styles