Cleaned up PWD.java