Refactor

adding some fixtures and general cleanup.