Remove trailing whitespaces
Incorporate some references with the package