cleanup of x.java
cleanup of ag.java
Cleaned up aj.java