More specs and cleanup