whitespace
Cleaned up, added comments

renamed clients to devices