Fixed directory, formatting issues