Utilize proper case for file system resources
General cleanup