Uptime

Uptime string fixed (#15)
Some more code cosmetics - function naming mostly