removed unneeded inner.
removed unneeded inner.
Cleaned up and changed BCs.