Adds assembly info and refactors some code