java code cleanup
xhtml cleanup
dynamic expressions fixes