Code style improvements (removed underscores)