Removed un-necessary code
Updated behavior
//TODO: key name constants