Finished cleaning up specs