Got rid of the need for hard-coded paths and cleaned up whitespace.