Removed stray comment blocks
Updated file read corresonding to newer android data