Sync: Improved merge
MainActivity: Added javadoc and cleanup