General clean up

Used NetBeans auto format and fixed some typos.