Removed comment
More proper key handling