Finished linking / cleaned code