Finished basic restructuring, styling nits remaining