Improved on code redundancy on show and store funcs

Cleared the redundant code and made the code more modular