DONE COMMIT. dijkstra added. Style guide changes