Added eab boilerplate and minor cleanup
Initial cleanup