Fixed previsour commit and some cleanup