Clean irrelevant specs & refactor