Realigned some things, deleted others