Style changes, readonly, added cs/java