added comments
Removed optionals and explicit unwrapping
Merge branch 'develop'