Modified to use relative path
Cosmetic changes