Cleanup + fixing specs