Added basic storage event handling and some code cleanup