Remove unused spec code + clean up style