Added relative paths and cleaned up