Cosmetic changes and added more dependencies