Start refactoring
Merged
Reset request time back to 5 minutes
Merge pull request #18 from onelight-studio/refactoring

Refactoring