Updated repository url and made some cleanup