Fix spacing, write some specs