Minor cleanup, moved declarations to header.