grunt configuration and code cleanup after extraction, and specs passing now