Bugfix
refactoring and optimizing
Cosmetic fixes
Optimizing the uptime data