Small improvements

Small code improvements, fixed some moments that are not allowed to clone my repository.