Fixed links and some minor code style