WIP: Code cleanup

Working on building some specs