* fixed some redundant data storing

Signed-off-by: Ession <mail@mathiasjost.com>