refactoring store object stuff make everything more clear and concise :)