Minor code cleanup.
Updating eclipse.
Target API 19