Improved comments a bit
File maintenance - moved inner class, removed unnecessary field
Updated for Vaadin 7 Beta 11 support