removed unused name attribute
improved data retrieval from database
finished comments