cleaning up so it assembles at least

cleaning up so it assembles at least