* Fixed comment dropped between & and type issue * Reduced nesting levels and avoided duplications * Removed extra allocations